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

Change-Id: Ic144a730f854113deacf7552947166030adf5856