Merge changes I00772405,Id9a6c59d

* changes:
  Added a method to fix graying of drawables
  Don't show mock location for emergency call