Merge "Hide backdrop when waking up from fp" into pi-dev
am: e752b75dad

Change-Id: Idebf2c288fa3de5a05329c9d0f53f9183c834d0e