Merge "Fix 3272590: Long-press on home & menu should be same as click"