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

Change-Id: Idde6a83cd75012b96e911b01d1993a3b6ca73973