Merge "Checking whether screen is on in constructor fixes 5658742"