Merge changes If2f987fe,Iedf42cbc

* changes:
  Fix layer rendering glitch.
  Don't draw TextView's alpha layers when not needed.