Merge "Update notification settings animation" into qt-dev
am: 1746ccca94

Change-Id: I0901382721e411cdd3a3970fe85f13524853b944