Merge "Defer onIsStashedChanged() until all controllers are initialized am: aed0c4d73e am: cc10db044f" into tm-d1-dev-plus-aosp