Update MoodBar to master

Change-Id: I0e7cf91182c51c5da0bb9516ed410279dbdf2026