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

Change-Id: I5b1ff4ba5708c7d470940fd46074aefe9c210b83