Merge "Fix restricted switch layout for small screens"