13d31e0162
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37' * commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37': Make USB mass storage hide keyguard when shown.