Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205bd7 am: f62145a41a
am: b2f177cfed

Change-Id: I0529af81547d9884867a45352892ee1b58a9590c