Merge "[Status Bar] Bottom margin command" into main