Merge "Sharesheet - Make ripples consistent" into qt-dev am: ff7fc1de48
am: 8e6c24d918

Change-Id: Iee44a535bfdb398c03acf603eb0e13a85317f20d