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