Merge "Modify manifest to handle display config changes on sleep" into sc-v2-dev