Merge "Merge "Fixed a bug where systemui could crash while cloning" into...
Merge "Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205b am: 0ae97980" into oc-dr1-dev-plus-aosp
am: 9d6ddff5
Change-Id: I9b6c54e942b7aa86b8a06a8c5bb325c089502f43