Merge "Remove unused variable 'screenon'"