Merge "Removed the deprecated screen state API" am: c438414190 am: 243047c574
am: 1fd613fedb

Change-Id: I11ddba206b9e2a56a9aa804878415f33c334d970