Framework: More shake sensitivity adjustments (1/2)

Change-Id: I99b2c5577455e4b3c9c8bdac7cea94291182376b
Clean up