Merge "Remove magic code to flash the screen"