Merge commit 'd1a9337380cf9f40f1aa095457b11242d483295d' * commit 'd1a9337380cf9f40f1aa095457b11242d483295d': Add a new window flag to display a window when keyguard is shown.
Merge commit 'd1a9337380cf9f40f1aa095457b11242d483295d' * commit 'd1a9337380cf9f40f1aa095457b11242d483295d': Add a new window flag to display a window when keyguard is shown.