Merge "Fix onIsStashedChanged() not called in 3 button mode" into main