b8a18d6fbc
At the same time reorganise the Onscreen sections. (cherry picked from commit 5ef71e17f7b9f2b254cc33e2f574a8a3a5cfb09d)