Merge "Consider lock icon when determining minimum top padding." into qt-dev