Merge "Rename Gravity BEFORE/AFTER to START/END"