Merge "Reverted the ScreenOff CUJ to the one prior to using test options." into qt-dev am: 872ba127 am: ce29856b Change-Id: I7fc1f8ecda479b015f2002b140c285af4bc7f001