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