Merge "Change dialog theme for dialog activity."