Merge "Add dock info view overlay"