Merge "Update user aspcet ratio settings button animation" into udc-qpr-dev