Merge "Removed the deprecated screen state API"