Merge changes from topic "heads_up_redesign" into pi-dev
am: db0e4f1d73

Change-Id: I95507d927831053efcb16ac9821f18a175d90bc4