Flip to mute/dismiss call: Moar Fixes

Change-Id: I5e2b8bd621e24fef414cc564fed268f465feb5dc