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

Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21