Merge "Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205bd7 am: 0ae979806f" into oc-dr1-dev-plus-aosp