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

Change-Id: Ibc06854ff0382055f1cff814f2e707531875e714