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

Change-Id: Ibd7703fbe50943517f448dbed2372b20ee355a2e