Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev