Merge "Update SysUI tuner so rotation button can be added/removed"