Merge "Fix layout for lock icon when in landscape"