Merge "Fix overlap between notifications and lock icon in portrait shade" into udc-dev