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

Change-Id: If29c615413ae327bd5423c0b97fd4873e04881d7