Merge changes I34d4d65d,I3d569114 into udc-qpr-dev

* changes:
  Enable MIGRATE_INDICATION_AREA For Droidfood
  Add flag for keyguard status view migration