Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
am: a2dbf80a13

Change-Id: I7b9bdcbf16e6b91d87e9c86609d9e1d7d174db44