Only use drawer back activity with drawer intent

Change-Id: Ibc0858d35fa2149781c15897fd34d49342b993f8