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