Merge "Fixes issues with multiple ringer rows (which also addresses a few RTL/landscape issues)." into sc-dev