AppBar fixes

Change-Id: I0ac21702cffb21b3b5f8176ffcdc68e905d5dfa8