Merge "Screen off animation" into pi-dev
am: 6e7e028b62

Change-Id: Ic45e6ef4e512221509bb7e49cb652576d6588e43