Merge branch 'i7300_idle' into test