Previously we were failing to update references to drawables that had been pulled from constant state, so we were drawing the wrong ones. Also fixes button Z translation on press, which was WAY too high. BUG: 18542282 Change-Id: Ifde7d64e31d31737854cfcbe75777e5b07a06e3a