Merge "[Status Bar] Implement per-rotation bottom aligned margin configuration" into main