Merge "Rollback collapsed flag in ResolverDrawerLayout due to b/147137182"