Merge changes I01be5d15,I5976d1a7 into udc-qpr-dev

* changes:
  Enable migrate_indication_area For Teamfood
  Move keyguard root view in z-order