Merge "Do not switch to HOME activity when OneTouchPlay API is called"