Merge changes I399e82b7,Ie399c733 into udc-dev

* changes:
  Stabalize OpenCameraOnDoubleClickPowerButton test
  Fix replacesLayer assertion to account for splashscreen layer