Merge "Reset bouncer hidden amount on keyguard show"