Merge "Update light reveal effect on wake/sleep so that the screen off animation works too." into sc-dev
