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

Change-Id: I55c470ed539b2ace8d79f7418a8c0ead1f19c3a1