Merge "Limit #ROT-SESSIONS to 4 in LayerRotMap and RotMgr"