Merge "Freeze screen while changing expanded desktop mode." into cm-10.2