Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev