Merge "Fix letterbox overlapping with status bar icons after rotating device" into udc-dev